Merge "PiP: Move tap-outside-hide block one level higher." into sc-dev