Merge "Set pending client to null after timeout resumes" into rvc-dev