Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev