Merge "Fix for recents button quick switch with only focus and desktop task" into main