Merge "Fix Resolver dragging animation" into tm-qpr-dev