Merge "Dreams (now Screen Candy) development." into ics-mr1