In this particular case, I believe you don't need to worry too much. iOS (since iOS8, I think?) randomizes WiFI MAC addresses to avoid this kind of tracking.
Android doesn't.
Android doesn't.
Still happy to be corrected. :)
Using randomized MAC address per SSID may break some well-established authentication scheme base on client MAC address. And it is not marginally stronger than only randomize when scanning, because the randomized MAC address is pinned to ESSID instead of BSSID.
Someone pointed out to me on Twitter that there's probably still more fingerprinting happening behind the scenes here, so worth noting as well.