Merge "[CDM secure channel] Increase message queue size to 500" into main