Merge "15/ Move some more logic into gesture/device state" into ub-launcher3-master