Merge "Fix rotation test faiulre on foldable devices" into sc-v2-dev