Merge "Fix PictureInPictureSettingsTest."