Merge "Fix testMetricsMatchesDisplay" into rvc-dev