Merge "Fix app icon in notification guts." into nyc-dev