Merge "Revert "Maximised the taskbar window to the default size"" into main