Migrated StoreKit/NonConsumables to unified API