Merge "Fix notification contrast with transparent bg" into oc-dev