Merge "Fixing activity leak via alarm in SecondaryDropTarget" into ub-launcher3-master