Settings : QuickSettings Cleanup

Use the new class introduced to avoid code duplication.

Patchset 2 - Cleanup
Patchset 3 - Rebase
Patchset 4 - Rebase and expanding of imports
Patchset 5 - Organize imports
Patchset 6 - Fix commit message

Change-Id: I6868563d6526bd7d5069c17d39cc6d2640476333
Merge remote branch 'cm/cm-10.1'