Merge "Fix light status bar transition"