Merge "Crop window frames by display frames when computing TPL thresholds" into main