Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the absence of home/up"