Merge "DirectReply: Prevent closing the IME window on reinflation" into...
Merge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev am: 6006a88e am: f6d93997
am: 1acabc5d
Change-Id: If29189aa958512c191b734b551bbfb54c994e0bd