Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread