Merge "Layout updates for LDPI overlay" into gingerbread