Merge "Copy multi-image editor fix to QPR" into tm-qpr-dev