Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev