Merge "Waiting Launcher to stop after swiping to unstash taskbar" into main