DeviceSettings: Add Cycle Charging Control

-Fix error in MasterSeekBarDialogPreference.java
-Organise settings a bit