Merge "Fixes for SyncRtSurfaceTransactionApplier" into pi-dev