Merge "Updating the card size logic" into ub-launcher3-master