Merge "block_suspend: avoid CPU spinloop"