Merge "Prevent LocalImageResolver from upscaling images" into tm-dev