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