Merge "Abandon in-flight app-search session when user stops" into sc-dev