master
8352638: Enhance code consistency: java.desktop/windows
8355611: Get rid of SurfaceManagerFactory