Merge "Needs more columns for large screen device" into gingerbread