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

Change-Id: I73c0ae9ed9df61acde669029d0b0c532af350f5a