Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev
am: 510cdad67b

Change-Id: I453002df3ec0a1af374dc8dbbb83f9683669e8be