Merge "Resize display to portrait for some wm unit tests" into main