Merge change 7633

* changes:
  Fix conflict with automatic DPI support on high density devices by forcing bitmap loading to not be scaled.