Merge "Save directory state and animate." into klp-dev