Merge "[Search] Support flexible results-per-row in AllApps" into sc-dev