wikimedia.org - retab only

for Scottlee of Change-Id: Ie4b00688ba168

to rebase on this and make it easier to review

Scott, was trying to find a way so that your
work wasn't for nothing but also make it easier
for folks to review this.

the idea being like 'first just the tabs, then aligned
arrows, then anything else'..

Bug: 68769

Change-Id: I3206b7a59f6ade67d15b6402e3be5ce70ec17554