Remove conflicting styles with TK4.0 (#14559)

Change-Id: Ic971acf3571a8e13b7a4d6f22908fae184353d1e