Retain UK visibility on upgrade
use visibility from legacy UK country in new UK country
Merge pull request #1266 from JeffPyeBrook/pr-1257-upgraded-country-visibility

Retain UK visibility on upgrade