7646: Composers.WinForms merge

with Drawing.WinGdi