Merge "Introducing GestureUiState with extra animation info" into main