Bring back s2w toggle

Change-Id: I0b1b1c208c24dc6990b509a357eb0fe4f5a5858e
Merge branch 'cm-11.0' of github.com:vineethraj49/android_packages_apps_Settings-kitkat into cm-11.0
Fix up S2W toggle at boot

Change-Id: I1ee182da5a78caa89a8c673289743635a3daaf29