Merge "WM: Cleanup TestAppWindowToken code and clean up mocktracker in teardown"