Merge "Some StatusBar cleanup"