Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev