Merge "Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev am: 0c1f41d3 am: ccb6ec86" into qt-r1-dev-plus-aosp