Merge "Fix odd jumps during clear all animation" into main