Merge "Migrate WM Shell test to new Test Ownership Model" into main