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

* commit '722b15e00065bebfd711a34123a64b1c4a65d8f7':
  Fix a regression in pausing activity immediately on sleep