Merge "Allow for synchronously applying transactions with a SurfaceView"