Merge \"Fix VD animator not being properly resumed\" into nyc-mr1-dev
am: ffa880b83f

Change-Id: Ie10f5c12f528fb3d07765d724ee2a59138863906