Merge "Implement Device Flag for shortcut integration with AppSearch" into sc-dev