Merge "Add support for wait-on-handlers command."