Merge "Revert "Shortcut integration with AppSearch (Part 5)"" into sc-dev