Merge "Remove compat mode dialog." into honeycomb-mr2