Merge "Fix immersive app resizing when repositioning" into main