Merge "[surfacetexture] Add patch to release current EglImage"