Merge "Show desk dock apps as screen savers." into ics-mr1