Continue to remove overkill usage of notifyDataSetChanged()