Merge "Align clipboard text editor with mocks" into tm-dev