Merge "Fix Taskbar unlock transition" into main