Revert "Framework: Forward port Expanded desktop capability"

This reverts commit af49ab109ea51aea33001e20801dcd1a9efa1df1.
Revert "Fix expanded desktop layout in landscape"

This reverts commit 66baafa0ec82cdcd8a0ac22abe55064b2a3b477c.