Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev am: 8565eab156
am: 722ec3df34

Change-Id: I40c533c72e0835c5f1e8f56820af9d9ea1d21f61