Merge "Avoid synchronization at method level in ImeTrackerService" into main