Merge "Check taskbar is transient before unstashing" into main