Merge "Landscape container padding update. b/30021487" into ub-launcher3-calgary-polish