Fix crash when cm's gapps are installed

Also, don't show the word "null"
Merge remote-tracking branch 'upstream/kitkat' into kitkat