It still seems to be OK to bring Note 7s on airplanes. Not bottles of water, though, that's too dangerous.
One fact that is overlooked is that there is actually a limit on the lithium-equivalent permitted per passenger just like there is a liquid-volume limit.
Last time I checked, the total maximum carry-on lithium-equivalent was 25 grammes which was about four smartphone batteries or two-dozen AA cells. Now as to whether that's an acceptable risk is for someone else more knowlegeable to evaluate.
I really, really dislike flying. Not because of the flying itself, but because of being treated like a potential terrorist all the time.