Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2