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

* commit '54a3bc8866ab5b3d324fe4efe08fa379af3249b3':
  Save directory state and animate.