Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev