Bluetooth Message notification causes pool swim to stop recording

Has anyone noticed this error with the fenix watches in general that when you are recording pool swim, when you receive a message notification from your phone, it causes the swim interval to stop recording strokes and lengths, but continues the time? I first noticed this when I had a fenix 3 watch that anytime someone would send a text to my phone while I was in the pool swimming, it would cause my Garmin device to stop recording swim stroke/interval length/etc while keeping the timer still running until I pressed the lap button. As such I would have 25m intervals being recorded taking 4-5 minutes if it happened at the start of a set! I ended having to turn the Bluetooth off my phone before I would get in the pool just to prevent this glitch, and when I bought the Fenix 6 solar pro I thought it would be fixed. Unfortunately, I encountered the same issue again while swimming when my device picked up a text sent to me and stopped recording again (minus the timer which kept going) until I hit the lap button at the end of the set.

Does anyone know of a way to have messages suppressed only while using the "Pool Swim" activity on the watch (ie: the watch knows not to pick up messages or interrupt the activity)? I can always do my old method of shutting off Bluetooth for my phone prior to starting, but having to turn it on and off every time I do lap swim seems too tedious and annoying considering it is a $800+ smart watch.