Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev