Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev
am: 0c1f41d303

Change-Id: I5fe274b32a93d301b8a9780a8e11d130fa890c92