Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"