Merge "More compatibility mode improvements." into honeycomb-mr2