Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev