Merge "Merge "Cancel current animation instead of candidate" into tm-qpr-dev am: 6eda179081 am: f9fd820f69 am: 8bb507a01e am: 4e10fc00af"