Merge "Add 'exit --wait-for-command' mode."