Merge "Correctly detect when switching back from full screen"