Fix timeout issue on drag&drop uploads (#1489170)

Conflicts:

	CHANGELOG