Merge "Optimize surface hierarchy"