Merge "Fix deadlock when creating new OneTimePermissionUserManager" into rvc-dev