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

Change-Id: I1d29ec289954e8cec337bb8235815f2e362f644d