Merge "Rate limiting PiP aspect ratio change request" into sc-qpr1-dev