Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev