Merge changes I22b55b73,Id050f2f5 into oc-dev

* changes:
  Only foreground service notifications can be colorized
  Fixed a regression where the scrim would be black