am 0d7c66b3: Merge 42c94791 from open-source master

* commit '0d7c66b3a555356315c17da48969fee28181ceda':
  Fix the animation disappeared issue