Merge "Make accessing mWaitingForDrawn thread-safe"
am: f0cf899033

* commit 'f0cf8990330dd592b114374ad15b75bc01f69e47':
  Make accessing mWaitingForDrawn thread-safe