Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev