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