[[ Bug 13021 ]] Split image frame density into x & y scale components
Merge remote-tracking branch 'ian/bugfix-13021' into bugfix-13021