Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2