Merge "Prevent showing immersive confirmation unexpectedly"