Add common overlays for s4 variants and fix up for ReVOlt Launcher