Merge "Fix unexpected exception from MediaHTTPService"