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

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