Disable a few overlays for now

Change-Id: Ic0f51156f29937d96cce97e1af39dfdccb2cd186