Merge "Prevent non-system overlays from showing over CDM UI"