Merge "Temporary workaround for taskbar hiding in Desktop" into main