Merge "Grants visibility on uri permission grant" into rvc-dev