Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev