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

* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
  Improve compat mode scaling implementation.