He just mentioned on the Nest that NIP-94 & NIP-95 will be optional in the Playstore build to be released today. So maybe you won't have to use the fork?