Merge "Add SwitchPreference"