Merge "Don't short-circuit setting StatusBarState if the upcoming state differs." into tm-dev