Merge "optionally wait for device available before erase"