Merge "Fix DeskClock dream on phones." into ics-mr1