Merge "Cleanup in EmulatorClipboardMonitor (1)" into tm-dev