Merge "Fix "division by zero" crash after USB mass storage disconnects"