Merge "One-pass rate control fixes and cleanups"