Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp * commit '98f310879790a98c4c24cd06677e08bf49f1cea0': DO NOT MERGE Fix bug 3026771, other design/asset fixes.
Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp * commit '98f310879790a98c4c24cd06677e08bf49f1cea0': DO NOT MERGE Fix bug 3026771, other design/asset fixes.