Merge "Clean up WifiTetherPreferenceController"