Merge "Make tether preference controllers extend BasePreferenceController"