DO NOT MERGE: Fix screen size compatibility mode.

Cherry-picked from HC.

Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
1 file changed