Disable a few overlays for now

Change-Id: I5fc74d5ce67e8fe2dc149d0277203a88fc8d3437