Merge "Add null-checks to mStatusBar." into nyc-dev