Merge "Correct colors on forcibly decorated custom notifications" into sc-dev