Merge "Fix notification contrast with transparent bg" into oc-dev am: 9b73401191 am: c84cd09d36
am: 9991fbd5bd

Change-Id: I5ac5e6a4d5348cf1469e2efbacb35d086037780a