Fix crash when cm's gapps are installed

Also, don't show the word "null"
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_ParanoidOTA into kk4.4