Merge "Add test for TREL service not unpublish when feature disabled" into main