Merge "Preventing FolderEditText from stealing drag events." into ub-launcher3-master