Merge "Replace AlarmClock with DeskClock in the SDK" into kraken