Merge "Refactor roaming preference"