Merge "Revert "Rate limiting PiP aspect ratio change request"" into main