Backport new DeskClock to CM10