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

Change-Id: I6ea47f95853616bb9198e02606d62a57d25e993a