Merge "api: Address API council feedback for createNfcResolverIntent" into main