Merge "Stop using unsupported Canvas operations in IME" into pi-dev