Merge "Adding alarms and reminders activity" into sc-dev