Merge "fix a bug related to gf_active_flags in multi-threaded encoder"