Merge "Add nullcheck for VelocityTracker" into ub-launcher3-master