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

Change-Id: I44ee1a14af2ef7f2743e7105e6cc04b9afdac460