Merge "Fix DocumentsUI causes Gmail to crash when performing drag-n-drop of a directory" into qt-dev
am: 42c430a166

Change-Id: I6c1acf94b0316de6663847ea87dc10176c78b0a0