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

Change-Id: I09da22dac83efec88ef6f3a1b3e2211f85c94dc8