Merge "Guard new added freezen metric by feature flag." into main