Merge "Put stopping service's host process on top of cached process list" into sc-dev