Merge "Sync with blast transactions in SurfaceView"