Fix expanded desktop layout in landscape

Change-Id: I9292ff994c2b5b185d47222be98665f36e528068
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2