Broken image URL because of an ampersand "&" before the question mark "?"

Found an issue that broke images URL, example:
.../the_image.jpg&h=6ccb2c19?itok=oSXmdgZi As you can see the "?" is after the "?".

Correct URL:
.../the_image.jpg?h=6ccb2c19&itok=oSXmdgZi

The bug is in the implementation of hook_file_url_alter:

  // In case the image style uses "crop_type" effect, load the crop entity.
  if ($crop_type && $crop = Crop::findCrop($file_uri, $crop_type)) {
    // Found a crop for this image, append a hash of it to the URL,
    // so that browsers reload the image and CDNs and proxies can be bypassed.
    $shortened_hash = substr(md5(implode($crop->position()) . implode($crop->anchor())), 0, 8);
    $uri .= '&h='.$shortened_hash;
  }

That is adding "&h=" to the URI, if the URI do not have a "?" later another implementation of the hook can add it and broke the image.

In order to fix it we should check if there is a "?" before adding the "&".

    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?').'h='.$shortened_hash;