Merge "[DO NOT MERGE] Temp workaround to track max beacons." into m-wireless-dev