Merge "Fix flicker in predictive IME back animation" into main