Merge "Fix waitingForDrawn callback not called when adjusting for IME" into nyc-mr2-dev am: 26ce8ba803
am: 5f5b007352

Change-Id: I4509a6a4a5c2880a5a48e42a8442a2f298ad8cb8