Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev