Merge "Align outer edge of profile tabs and icons" into tm-dev