Merge changes Ib678f277,Ieaae2f9c into main

* changes:
  Fix notification visibility when screensharing
  Refactor NotificationEntry utility methods