Merge changes Ibd8d1ce0,I9e06ca2b into main

* changes:
  [SB][Notif] HeadsUpApperanceControllerTest improvements
  [Notif] HeadsUpManagerImplTest: Remove Assert, remove Hungarian notation