Merge "Fix Add button animations" into main