Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2