Merge "AdapterViewAnimator now properly handles notifyDataSetChanged"