Merge "Add in-service wait timer config for ECC dialed in APM" into main