Merge "Restore PiP to freeform only if Desktop Mode is active." into main