Merge "Clear span array and set only 1 span when phone number changed" into nyc-dev