Move "battery around unlock ring" feature to AdditionalSettings

This looks more better to me
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy