Merge "Fix issue with jumping PIP when IME shows." into oc-dev