Merge "Remove handling for client status races"