Merge "Add getDrawable API overrides with Icon"