Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1