Merge "Apply PictureInPictureParam only if it's changed" into main