Merge "SurfaceView: Correct comparison operator."