Merge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev