Merge "Filter trigger for desktop windowing education" into main