Merge "Fix crash of PictureInPicture" into udc-dev