[[ Bug 12008 ]] Tweaks to bugfix - some combinations of screen scale and device scale weren't working.