DeviceSettings: fix enable/disable options that can be overlaid

Change-Id: Id2e1c11b6337bfbb26dc31ca0eb067a89b131a19
Merge branch 'cm-10.1' into martincz