Merge "Fix ViewAnimator.getDisplayedChild() bug"