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

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