Merge "Use external pakcageName id if ActivityThread has no current PackageName" into qt-dev