Improve default behavior of feature-usage-tracking