Merge "Make more room in the ActionBar"