Merge "Fixing timeout caused by non executed animation"