Revert "Hide shelf in 2-Button Landscape"

This reverts commit 9b5795a57969e9dd5d108fcaf7890f9cb7fdb7e2.

Reason for revert: b/155090034

Change-Id: If7decd54965a680d50e4474fb279ebe0002441bb
9 files changed