Merge "Removing PiP notification channel." into oc-dev