Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev am: 3946916d56
am: 8296054d4e

Change-Id: Iaf35647355f48300199d888eb884a23750c0059b