Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev