Merge "Make accessing mWaitingForDrawn thread-safe"