Merge "Don't notify dead client about losing control" into rvc-dev