Merge "Refactoring TimePicker packagename." into ics-ub-calendar-cream