Merge "Fix waitingForDrawn callback not called when adjusting for IME" into nyc-mr2-dev