Merge changes I5887c0b0,Iae05381b into udc-dev

* changes:
  Replace NSSLController usage in NotifShelf w/ NSSL
  Remove StatusBarStateListener from NotifShelf