Merge "Fixing taskbar unstashing after unfolding" into main