Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1