Merge "Revert "Layer based rate control for CBR mode.""