Merge "Don't call DPM from UserManager to avoid lock inversion"