am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1

* commit '25a43adabb70aa769a097c6cb09d71b031431677':
  Dreams (now Screen Candy) development.