[#5] Add enhancement to avoid blinking of the marker after animation ended.