Merge "Ensure notification color contrast" into nyc-dev