Merge "Disable bookmark drag&drop support"