Merge "lshal: add wait command"