Merge "Replace static RestrictedLockUtils call with injected UserRestrictionChecker, so we can mock it in testing." into main