Merge "Properly disable status bar on secure lockscreens."