Merge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc-mr1-dev
am: 01acf40e0f

Change-Id: I0d38aca1c53c31e54819979eafd2f2dc37b2071a