Merge "Fix issue #4603422: Compatibility mode button doesn't always update" into honeycomb-mr2