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

Change-Id: I827418c72626dcf6bdf45e088d2a2cda68bf19e4