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

Change-Id: I7a779fde87442bce23b1c6edc344197be2111f4f