Merge "Fix issue 5905210, AdapterViewAnimator sending negative index to Adapter"