Merge "Using success animation from state instead of configuration" into main