Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev
am: 22dec763a3

Change-Id: I7b98e69b0032daf5dd0ca66ddf1067504b8e7f39