Merge "When logging ranking positions, use the number of displayed targets in calculating offset rather than the total number available." into rvc-qpr-dev