Merge "Enable the CUSTOM_LPNH_THRESHOLDS flag." into main