Merge changes I669f379d,Idd5fb950

* changes:
  Fix ConcurrentModificationException
  Update output switch UI