Merge "Fix flaky AppWindowTokenTests"