Merge "Add flag for immersive app repositioning" into main