Merge "Switch to new API for managing blocked numbers (1/2)" into nyc-dev