Merge "Update feature flag config of unbinding inactive TIS" into main