[Build] Revert patches after qt build
[Win] Add spaces to win style names
[Build][Win] Revert patches after qt build