Proper fix found by https://github.com/mateor/android_packages_apps_Settings/commit/25a1badf053602288783322a48c5e0168a04dd04