Merge "Allow forcing status bar state changes and do so during a cancelled screen off." into sc-dev