Merge "Fix some jank issues with the clipboard" into tm-dev