Merge \"Initial changes to tweak layout.\" into ub-launcher3-calgary
am: c80a024fb0

Change-Id: I5415a152ff36b32a815cc753ea2e929f1e9506b4