Merge "[DK2-2]Add flag to control dynamic keepalive mode"