Merge "Fix flaky RequestPinItemTests" into tm-qpr-dev