am e9b79e3a: (-s ours) Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1

* commit 'e9b79e3aade7c51dee8ec9ef263c53c166a591c6':
  Pulling screen savers for now. DO NOT MERGE.