Merge "Add transfer mode support to ShapeDrawable" into oc-dev