Merge "Update Drawable API to expose getOpticalBounds method as well as the Insets class"