Fix merge:

- Some code cleanup
- move some preferences, to get closer to CM`s reorganized menu structure

Change-Id: Ia6648e558f6827c01b462cd3747dd254894c3756