Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI