Merge "More cross-user Uri granting tests." into rvc-dev