Update to upstream mater and fix animation driver.