Merge "Fix issue with jumping PIP when IME shows." into oc-dev
am: 52a4125ffd

Change-Id: Ifc985e6368555fa1332315a1a6a52ced7fb705bd