Merge "Add flag for PiP in Desktop Mode." into main