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

Change-Id: I66cc2633ae230ce1eaf5c2fd0483e333f47e65b1