Merge "SurfaceView: Wait to gather transparent region." into oc-dev