Since you are doing the copy route and not sharing code with src/ios, these callbackId fixes should be in a separate issue against iOS, and should be in a separate pull request.