Merge changes Iccedcb9b,I632c052e

* changes:
  BootAnimation: Minor whitespace fix
  BootAnimation: Avoid memory leak in error case