am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev

* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep