Merge "Revert "Change TAPL to swipe to stash taskbar (instead of deprec..."" into main