Merge "Remove preserve surfaces when surface format changes."