Merge "Cleanup flag "create_windowless_window_magnifier"" into main