Merge "Fix issue with IconAppChipView animated states" into main