Merge changes Iae65d604,I3024443c into sc-v2-dev

* changes:
  Fix IME flicker when switching recents tasks
  Consolidate DisplayContent#assignRelativeLayerForIme