Merge "Remove unneeded statusbar view references from StatusBar.java"