Merge "Unstash taskbar after timeout when cursor hovers bottom edge." into main