That merge has already been done in core and qt, we're following. I broke picture scan details panel image loading. Will fix later.