Merge "Use a copy of surface control when creating window decoration" into main