Merge "Add windows to window tokens in expected z-order"