Merge "Do not show static overlays as a theme" into oc-dev
am: 170acdb79b

Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa