Merge "Fix NPE in the statusbar." into honeycomb-LTE