Merge changes I9ba57f43,I236b039c into tm-dev

* changes:
  Cleanup in EmulatorClipboardMonitor (4)
  Cleanup in EmulatorClipboardMonitor (3)