Merge "Optimize the order of setting remote animating state" into main