Merge "Multi-image editor fix" into tm-qpr-dev