Merge "OMS: Remove old overlays.xml versions"