Merge "Clear listeners after animation" into tm-qpr-dev