Merge "Fix app pairs launch from in-app Taskbar" into main