Merge "[Thread] clear calling identity before invoking app-supplied callback" into main