Merge "Run PeopleService.onUserUnlocked() on worker thread instead of main thread" into rvc-dev