Merge "Enable CTS for shortcut integration with AppSearch"