Merge "Resolve start/end insets in LayerDrawable.getIntrinsicWidth()" into mnc-dev