Merge "Fix NPE in BaseStatusbar in onListenerConnected"