Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev
am: 22f79f250c

Change-Id: Id44dbec56c7355a3e67a95d452606c11da247546