Merge changes I5241086c,I3e96ab6a

* changes:
  Cleanup in EmulatorClipboardMonitor (2)
  Cleanup in EmulatorClipboardMonitor (1)