Merge "Fix juttering problem with split staging animation" into tm-qpr-dev