Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev