Merge "Check client hidden state before resetting draw state."