Merge "Fix ConcurrentModificationException in TouchInteractionService" into main