Merge "Revert "Don't use ProxyActivity when launching from SearchActionItemInfo intent"" into sc-dev