Merge \"Maintaining separate alpha for x and y translations\" into ub-launcher3-calgary
am: 713afa70e5

Change-Id: I6b2df60cd994b466b1580a521d3b72326f5403f5