Merge "Hide sensitive clipboard content" into tm-dev