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

Change-Id: I999d6cbeb34698ff8aa8114ab8000eaa1d1473b9