Merge "Fixed a few issues with blast sync with SurfaceView"