Merge "Ensure BSSIDs are correctly aged out in settings view"