am e06e1619: Merge "Fix issue #6700897: Activity paused by activating the..." into jb-dev

* commit 'e06e1619a153a902083d2a1a0c01c86d3c7e546e':
  Fix issue #6700897: Activity paused by activating the...