Merge "Fix ConcurrentModificationException in TvInputManagerService"