Merge "jank: un-handled deferred transaction" into qt-dev am: d85b0dd335
am: 84ec09fa47

Change-Id: I548cdc070c67345cf3c4bb8b0a864a13efd93808