Merge "Clarify RpcServer shutdown error for corner case"