Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev