Merge "Ensure Taskbar stashes when launching an app from folder" into main