Merge "WM: Don't skip on parent changed when creating TestAppWindowToken"