Merge "Fix NPE in BaseStatusBar."