Merge "Catch possible exception while uploading texture" into rvc-dev