APOLLO-3567 Removed UidSettingListner from the domain model