am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"

* commit 'bd5ee4d39c8d7d1fc2c1f94980875f1900880880':
  Fix NPE when pasting non-text from Clipboard