Fix Proximity FINIAL (I hope)
Merge branch 'master' of https://github.com/OptiPop/packages_apps_settings into HEAD