am 00d3e361: Merge change 7153 into donut

Merge commit '00d3e361148133cea354d358757628b0acc01b75'

* commit '00d3e361148133cea354d358757628b0acc01b75':
  Restore PopupWindow's original behavior and add an API to control the soft input