Merge "Lower timeout of upload stash -> image scaler requests"