Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev