Merge "Adjusting PiP for the TV IME." into oc-mr1-dev am: ca468f1983
am: 12a2b5e55d

Change-Id: I4fafb0805f9bade0fa884ecde5d13930e1ec25f0