Merge changes I173c7656,I5570c080 into main

* changes:
  [Notif redesign] Adjust margins of "small" icon
  [Notif redesign] Make group header respect header height