Merge "Fix NPE when pasting non-text from Clipboard"