Merge "Clear calling identity when executing the callback"