Merge "Check for expired mergeTarget in mergeAnimation" into udc-qpr-dev