Merge "Fix UserRestrictionsTest#testUserRestrictions_primaryProfileOwnerOnly" into sc-dev