Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2