Merge in changes to clipboard handling from trunk.
Authored by: david_costanzo 2019-12-29
Parent: [r5083]
Child: [r5085]