Merge "Retain IME surface with a timeout"