Merge "Remove problematic early return from notifyDataSetChanged"