Merge "Hide shelf in 2-Button Landscape" into ub-launcher3-rvc-dev am: 08619f8600

Change-Id: I9a23f52c7e61dbd930b4143bf0de3de274bd2b21