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

Change-Id: Ie5a84b07a94966ba811e7d07a552cd3fa20e8cec