Merge "Fixing launcher going to a different state when dragging an icon from different activity" into ub-launcher3-edmonton