Merge "Keep track of USER_QUERY to pass to the intent."