Merge "Spiffy new compatibility mode UI." into honeycomb-mr2