Merge "revert the surface purgatory list and dependent changes." into gingerbread