Merge "Revert "Move focus for windows in freeform mode"" into main