Merge "Blacklist APs instead of disable"