Merge "Add config value to switch between Tether Settings UIs."