Merge "Use normal rate_correction_factor for gf in CBR mode"