Merge changes from topic "cutoutProvider" into tm-qpr-dev

* changes:
  Re-land ScreenDecorations Cutout Provider
  Move color and display info into DecorProvider