Merge "Fix typo causing immersive mode transition flickering."