Merge "Workaround to fix remote animation hanging." into sc-dev