Merge "Fix notification drag and drop flag"