Merge "Fix overview to split pair animation" into tm-qpr-dev