am 0972ae15: Merge "Save directory state and animate." into klp-dev

* commit '0972ae156b2e7f033baaf551e26b425e90faa895':
  Save directory state and animate.