Merge "[ToA] Metrics in Settings" into main