Merge "Hide Display Theme from search results when not available" into oc-dev...
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e33 am: 7868a752
am: ec0206ef
Change-Id: If7e5824da83c0adc5701f9a40ca38b4b0b5bc836