Merge "[ToA] Add the metrics in Settings" into main