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