Merge "Ensure notification color contrast" into nyc-dev am: 9b95f61
am: e933de8

* commit 'e933de8e769fb78d8af8b965d329ab91bccdbd15':
  Ensure notification color contrast