Merge "Parent notifications should always be normal notification color" into nyc-dev