Merge changes from topic "nic-collection-sync" into main

* changes:
  Prevent desync of NICViewBinder + NotifCollection
  Fix heads up isolated notif icon race condition