Merge changes from topic 'SettingsMetrics' into nyc-dev

* changes:
  Add metrics for suggestions
  Add metrics for settings conditionals