Merge "Shorten IME surface caching duration" into tm-dev