Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays" into rvc-qpr-dev