Merge "Don't hold mPackages when clearing package state" into qt-dev