Remove usage of ViewOutlineProvider, add v21 styles

Change-Id: I1ed503600b58fbf3d9731a877c7c125c5d453d03
4 files changed