Merge "Don't hide text in pre-drag when opening popup above icon" into ub-launcher3-dorval-polish
am: 9ff727ef44

Change-Id: Id8cb80e35a1ec30e91427b4d75a783c130d6df90