Merge change 7840 into donut

* changes:
  Fix issue where scaled bitmap sizes could be wrong.