Merge "Switch to PictureInPictureParams#isSameAspectRatio" into main