Merge "Avoid overflow in focus fudge calculation"