Merge "Allow direct-callback alarms for non-wakeup alarms"