Merge "Revert "Don't crash on dialer app target search results"" into sc-dev