Merge "Fix SubscriptionManagerTest#testSubscriptionGrouping." into qt-dev