Fixes #17822. Fix more failing cases when onFlickAnimationStart/End() are not properly triggered
(cherry picked from commit ab5ea219374e503a2d384940d6518a7f061aac17)