Merge "Temp workaround to track max beacons." into mnc-dev