Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am: 9f93faf7ae

Change-Id: I596f52f4db123c3df485a1a194966771706650db