Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev