Merge "Unbind context before deleting surface/context"