Merge "Fix StatusBar setting disable flags before setting up"