Merge "Update PiP on display change" into main