Revert "Fix expanded desktop layout in landscape"

This reverts commit 1da4134947cc153bcf038d3cb490591619b6e721.
Revert "Fix hidden navigation bar in expanded desktop mode not being correctly"

This reverts commit bb54a6a58554f9eba2072d5fd1e58cc1a4b1209d.