Merge "Fixing wrong padding being set in multi-window + landscape" into ub-launcher3-edmonton