Merge "Improve compat mode scaling implementation." into honeycomb-mr2