Merge "Do not move PiP upon Display change during exit" into sc-dev