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

Change-Id: Ieee87b1843754154e02dbc0a4ad2d9b7f224116f