Merge "Allow CDM to hide overlays"