Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2