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

Change-Id: I33b6de72288e0a73b6a04c34b3c1a15549c68412