Merge "[Windows version] WindowImpl cleanup, fixes and improvements." into devel...