am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev

* commit '3cb25e91b419d4f18fec8ea2ceec33eb0915096a':
  Resume user where they left off.