Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1