Merge "Not to remove the same animator twice" into qt-dev