Fix layout issues affecting some Gingerbread phones
Fix text wrapping issues affecting some Gingerbread phones