Merge "Fix mul-overflow when converting scan result's age from ms to us" into main