Merge changes I13f7ef44,I9381c1fe into main

* changes:
  [Notif redesign] Circular icons for Call Notifications
  [Notif redesign] Circular icons for Messaging Notifs