Merge "Fixes regression on preserving PiP position"