Merge "Updating drop target assets" into ub-launcher3-burnaby