Merge "[Settings] Add metrics for supporting performance measurement"