Fix Settings FC on boot / Moved headers / string changes
Merge https://github.com/DirtyUnicorns422/packages_apps_Settings into jb-mr1