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