Merge "Revert "Hide shelf in 2-Button Landscape"" into ub-launcher3-rvc-dev