Merge "[Search][Layout] Fix blank space when predictions are disabled" into sc-dev