Merge "Fix filtering of DesktopTaskViews" into main