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

Change-Id: I3831451d1a668bbfcd69bddd84934961da167bed