Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev