Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev