Merge "Fix NPE in AddUserWhenLockedPreferenceController."