Merge changes from topic "bye-niac" into main

* changes:
  Remove enabled NotificationIconContainerRefactor flag
  Hard-code NotifIconContainerRefactor flag to true