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