Merge "Twilight alarms are now non-wakeup but exact"