Code hygiene: Move overlays into separate stylesheet

Change-Id: I1c479de51f2814a635af6176834905f725868945
Merge "Code hygiene: Move overlays into separate stylesheet"