Merge "Fix NPE when finishing remote animation" into tm-qpr-dev