Merge "Remove usage of ViewOutlineProvider, add v21 styles" into ub-deskclock-army