Merge "Fix potential deadlock in applyUserRestrictions methods." into udc-dev