Merge "Make accessing mWaitingForDrawn thread-safe" into nyc-dev