Merge "Rate control changes on active_worst_quality"