Merge "SurfaceFlinger: fix deferred transactions for buffers with timestamps" into qt-dev