Merge "Don't add wifi entries twice, when returning from another activity." into honeycomb