Merge "Notify unlock controller when remote animation ends due to null finishedCallback." into tm-dev