Merge "fix AppPermissionGroups to match AppPermission" into rvc-dev