Merge "Fix NPE in BaseStatusbar in onListenerConnected"
am: ffef959ca4

* commit 'ffef959ca4e2607a3e4e3f0f23e4aaa3e1b3aafa':
  Fix NPE in BaseStatusbar in onListenerConnected