Merge "Move TYPE_WINDOW_CONTROL toString flag check" into main