Merge change 8832 into donut

* changes:
  fix [1996214] Boot animation is occasionally messed up