Fix a crash when General Settings is opened

Change-Id: Ia6da05c2628cb82479d2184c996b371f1f7cfb50
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Calendar into kk_mkt