Merge "Revert "Flip BLAST for SurfaceView""