Merge "Revert "[Search][Motion] Separate AllApps scrim and content interpolation"" into sc-dev