Merge "Factor viewport scaling into coverage calculation"