Fix the 8-target layout once anf for all!!
From AOSPAL: https://github.com/AOSPAL/android_packages_apps_Settings/commit/76b863394e3efc87824fd324b141ba9a1e53371e