Merge "Action bar tab layout tweaks."