Merge changes Iab923d09,Ibd18d410 into sc-dev

* changes:
  Updating owners of SystemUI
  Fixed an issue where the user would have no notifications on lockscreen