Merge "Fix black flicker when closing IME" into nyc-dev