Merge "Hide Display Theme from search results when not available" into oc-dev