Merge "Don't hold mPackages calling addPreferredActivityInternal" into qt-dev