Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev