Merge "Set availability of AddUserWhenLockedPreference before it gets displayed." into main