Merge "Workaround to not use the hidden SyncRtSurfaceTransactionApplier"