Merge "Handle user stopping in AppSearch." into sc-dev