This past trip a couple of weeks ago I discovered the wonderful free water in the Freestyle machines. You can use any water bottle that fits under the spout. So convenient and makes it easier on the QS TM's that aren't constantly being asked for cups of water. It also worked in the machine in the hotel grab n go. We had water delivered to our hotel with a grocery delivery, and just used those bottles (Publix and occasional Smartwater).
The security at the HRH stop point (the walking path ones, didn't take the boat) never bothered me. I always had a water bottle in my drawstring backpack, either empty because I planned to refill it in the park, or full because I either had a new unopened bottle or had just filled it at the hotel before I walked over.
The official word was water bottles had to unopened (factory sealed) due to HHN, but they never gave me an issue with my bottles.
No Freestyle machines in the HP areas, so fill them up before you go to the WW.