I still say some floats like in this thread
Mavic water recovery system
are probley the best way for a few reasons:
The drone doesn't have to sink for it to work.
The Drone will be more visible fully above water or even if upside down to see the noodles then just a tiny cap.
There is no delay for it to come up.
No other requirements needed for deployment that may fail.
Cheaper
Still easy to remove or strap on if your going over water.
The problem with that system is that it is bulky and adds too much aerodynamic drag and weight to the Mavic. Also it's looks like a pain to install it and take it off. A much simpler solution along the same line of thought would be to take a block of black foam that is 2 inches thick and cut it with a hot blade to the shape of the top of the Mavic and then give it a bit of and aerodynamic trim and clip it onto the top of the Mavic with 3 elastic bands. It would work just as well as those big Buoys in the video clip and would impact the flight characteristics a lot less.
What I am looking for is a more elegant solution. It can be done, it will just take time for some company to design it. The Mavic is really popular so I have no doubts someone will come out with a unit.