Merge "WM: Cleanup TestAppWindowToken code and promote ZOrderingTests to non-flaky"