Merge "Avoid overflow in calc_iframe_target_size" into main