Merge "Enable blast adapater for SurfaceView"