Merge "Updating drop button targets" into ub-launcher3-burnaby