Revert "Fix hidden navigation bar in expanded desktop mode not being correctly"

This reverts commit 91f8e50bfb90a62c39b9e462e05faa0780bc3cd5.