Merge "Tweaking PiP for accessibility." into oc-dev am: d584a5e65b
am: 1176231c27

Change-Id: I9072175aa1bb77842d2560ce8bd6c56466da8123