Merge "Correct PiP inset adjustment." into nyc-dev
am: 54a3dd53fe

* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
  Correct PiP inset adjustment.

Change-Id: I4dd488abc3f9eb84a7c4fc198837f7bb715964b5