Merge "Fix initial StatusBar wiping out disabled state"