am 08df7d91: Merge "Freshen restored stacks, more UX bug fixes." into klp-dev

* commit '08df7d9137bd90c57623bc9cc9db3629e3a945eb':
  Freshen restored stacks, more UX bug fixes.