Merge "Fix WXGA skin" into honeycomb