Merge "Fix some blast issues with SurfaceViews"