Merge "Allow VDM flags to be used in PermissionController" into main