Merge "[SurfaceFlinger] Add deferred txn trace points." into qt-dev