Merge "Fix handling of multi-package enable rollback failures." into qt-dev