Merge "Non-generic grants also need forceUriPermissions." into rvc-dev