Merge "Modify desktop windowing exemption logic and criteria" into main