Merge "Fix long press after already moving off icon" into ub-now-nova