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

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