Merge "Partially reverting waiting for animation when setting widget result" into main