Merge "Cleanup in EmulatorClipboardMonitor (3)"