Merge "Track usage of highlight feature"