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

Change-Id: I06ea14b8c99558985199987d1c036a7ed6b03742