Merge "Adjust iconography in notification guts." into lmp-dev