Merge "Run PeopleService#onUserStopping on a background thread" into rvc-dev