Merge "Add test for move PiP upon Display change" into sc-dev