Merge "Update running remote animation state after activity change" into tm-dev