Fixes #17822. Fix more failing cases when onFlickAnimationStart/End() are not properly triggered