Merge \"Fix container horizontal padding\" into ub-launcher3-calgary
am: 314d53fbaf

Change-Id: Ia16127fa4a868de5b51f1ce9d96cb349edfd2162