Merge "Prevent NPE at TaskStack#resetAnimationBackgroundAnimator"