Merge "Fix issue where two translation animations clobber each other." into tm-qpr-dev