Merge "Merge "Update colour to match toasts." into oc-dr1-dev am: 91866c65a5 am: ede09428f6  -s ours" into oc-mr1-dev-plus-aosp