Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread