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

* commit 'ce83dcf4f7ed2082c72b062c7388a4314419e225':
  Fix black flicker when closing IME

Change-Id: Ib6be479dd0e40371c25845a958313e65234f9832