Merge changes Ia6722e1c,I6bef36c7

* changes:
  Better IME transition while switching app with recents (5/N)
  Better IME transition while switching app with recents (4/N)