Merge "Correct PiP inset adjustment." into nyc-dev