Merge "Hide Display Theme from search results when not available" into oc-dev
am: 9f2f9e331f

Change-Id: I478def41cfe2e639ec6d93ef9bbe2d79fda46142