I think it's definitely a wait and see what they announce. Coasters too will be a big question as will they want you to wear them on Hulk or RRR with the potential of them coming off.
Although I have seen SeaWorld testing people with masks on Mako to see how they hold up on that ride which is the fastest in Orlando.
Someone on another Universal message board just posted saying guidelines were updated to say face masks aren't required for rides with water features...I have no clue where to find these guidelines