Merge "Freshen restored stacks, more UX bug fixes." into klp-dev