Remove the obsolete keys of UICalendarCategoryManager
Merge commit 'eea7289544b9ba3a640cfb9434fb9c86831a55aa' into HEAD