Merge "Fix race condition in MediaHTTPConnection" into pi-dev