Merge "Add cross-user check for getSmsRoleHolder()." into sc-dev