Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev