Settings code clean up
Customizable lockscreen & navring targets (2/2)
Based on these commits:
https://github.com/omnirom/android_packages_apps_OmniGears/commit/bc00afebaee96fcaab2ff97cec783e19f335f4ab
https://github.com/omnirom/android_packages_apps_Settings/commit/8f8c14597dc6d50b178d0e6ceb33836f9c6c1a60