fix NPE
Merge branch 'dc43-b' of github.com:Droid-Concepts/packages_apps_Settings into dc43-b