Merge "Fix leakage of unit test on large screen/foldable device" into main