Merge "Follow new PinnedPositions API changes (2/2)"