Merge "Refresh conntrack entry timeout"