Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev