Merge "LDPI Makeover" into gingerbread