Merge "Handle picker defaults for notification and alarm" into nyc-mr1-dev