Merge "De-dupe animation name" into qt-r1-dev
am: f0581b95fa

Change-Id: I675d8618a9a1f93526e83cd52bb1ca9719d14006