Merge "New tap on PiP window behavior" into sc-dev