Merge "Clear binder calling identity before calling callback"