Merge "Handle returning a result from automatic up navigation from another task." into jb-dev