Merge "Do not show static overlays as a theme" into oc-dev