Merge "Refrain from creating app-search schema unnecessarily." into sc-dev