Merge "Rename flag ADD_TRANSIENT_HUN_IN_STACK_STATE_ANIMATOR" into main