Merge "Follow Firefox & Chrome GIF behavior" into udc-dev