Merge "Extract dozing parts of StatusBarState logic out of onStateChanged"