De-herp the navbar timeouts
Merge branch 'jb2' of https://github.com/CarbonDev/android_packages_apps_Settings into jb2
new navbar timeout values