Try to fix no-stretch / no-scale for non-square pixels (#1636).