Merge "Refactor Drawable outline production, flesh out Outline methods"