Merge "Fix infinite loop when registering data usage callback." into nyc-dev