Merge "Adjust boundaries for screen sizes." into gingerbread