add 'never' entry in screen timeout tile
Merge branch 'cm-10.1' of https://github.com/fonz93/android_packages_apps_Settings into cm-10.1