Merge "Avoid underflow on an unsigned int when computering bg overrun"