Merge "Reworking the ActionBar tab API"