Merge "Cancel touches on the unlocked animation" into tm-dev