Merge "Keep light status bar flag when opening notification shade"