derp

Change-Id: I112ade610b28be8041b067f5d3dbaf263a38cadc
Merge https://github.com/Mungohigh/TitanOS_packages_Settings into HEAD