Merge "Move from old setOutline() api to setOutlineProvider()"