Merge "Clean-up unnecessary desktop windowing flag usage" into main