Merge "Making padding a little smaller in portrait to accommodate larger spanish tab text. (3393521)" into honeycomb