Merge "Fix failed ConcurrentMultiSessionImeTest" into main