am e640d259: Merge change 8832 into donut

Merge commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3'

* commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3':
  fix [1996214] Boot animation is occasionally messed up