Merge changes I18ded714,I560c6f7c into main

* changes:
  [Notif redesign] Update spacing of collapsed group children
  Use a switch statement instead of static list of layouts