Merge "Disable Bitmap density scaling to Picture" into pi-dev