Use the new TabKCM API to improve the code and looks
Depends on D23835
+1, lovely code simplification.