Merge "Further one-pass vbr rate control changes"