Merge "Revert "Calendar: Drop no longer existing activity from manifest""