Merge "Fix bug where Cancel/Remove drop target text was not being updated." into ub-launcher3-master