Make sure that the count is a zero modulo the new mask before
scaling, otherwise the next time until a measure triggers
will take only 1/2 as long as accounted for. This caused
the 'min time' to be potentially off by as much as 100%.
Github-Pull: #9200
Rebased-From: e0a9cb25b0af87723d50cb8d8cffa10f1ebf7dcc