Merge changes Iba1cee95,Ic5192c78 into sc-dev

* changes:
  Add injectable version of Assert.isMainThread()
  Break circular dependency in NotificationEntryManager