Merge "DeskClock: Fix Force close caused by IllegalStateException error."