Merge "Fixed the aspect ratio in PictureInPictureAutoEnter" into sc-dev