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

Change-Id: I72661874e79e48b121030a6abce849a2a319cc36