Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1