Merge "Don't use concurrent message queue when debugging is enabled" into main