Merge changes I10b2c9cc,Id8ebf066 into main

* changes:
  Use app icon in notification row.
  Use monochrome app icon for notifs