Merge "Chaning touch to tap" into ub-launcher3-calgary