Merge "Apply window crop on entering PiP transition" into sc-dev