Merge "No longer stash taskbar when swiping up all apps" into tm-dev