Merge changes Iff142ccd,I724080ed into pi-dev

* changes:
  Multi cutout: Fix IME navigation guard
  Multi Cutout: Fix more cutout issues