Merge "Maintaining separate alpha for x and y translations" into ub-launcher3-calgary