Merge "Add support for animating non-running tasks" into main