i9100g: Update and cleanup overlays

Change-Id: I6f4ef69ef5d1c07bca202a67d70ff4043d12c2d2