Merge "Cleanup in EmulatorClipboardMonitor (4)"