Merge "Do not report finish in mergeAnimation..." into 24D1-dev