Merge "Adding sharedPref for blocked number migration" into nyc-dev