Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev