Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2