Merge "Remove preserve surfaces" into sc-dev