Merge "Not to remove the same animator twice" into qt-dev
am: 0000b85277

Change-Id: I4d905845d774937df098eb4f6037cd1e70808941