Merge "Update ADD_TYPE_WINDOW_CONTROL to ENABLE_TYPE_WINDOW_CONTROL" into main