Merge "Add listening field to be used to set animate" into main