am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2

* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.