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