Disable conflicting overlay

Change-Id: I98748f58fadc732f22e16239fcecd61aadb07065