Added passing window IDs to Window and WindowDialog.