Merge changes I7ee8cd9f,Id8bc42cc

* changes:
  Clearing the user settings when feature flag off
  Log grammatical inflection API usage