Temporary work for fixing remaining buggy scenarios in drag'n'drop

Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>