Merge "Uri permission grants improvements, tests, fixes." into rvc-dev