Merge "Grant visibility even when not granting URI perm" into rvc-dev