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

* commit '2478281de362c86825cd93d6395af4197d1adb73':
  Resume user where they left off.