Merge "Fix stuck unlock animation state" into main