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

Change-Id: Ia6a4f5b007700d3e87487dffb4b8decda3480319