Merge "Fixes for SyncRtSurfaceTransactionApplier" into pi-dev
am: 1df0616e27

Change-Id: Id3386fc4a226181c41c02b2ec32d61fc2e4ad6a8