Merge "App Pairs: Implement Taskbar functionality" into main