Merge "Elicit ItemsData class and add DiffUtil.Callback"